From: Joakim Verona <joakim@verona.se>
Date: Sat, 17 Aug 2013 04:51:11 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d83564549f573e0934653129d18597892d3533de;p=emacs.git

merge from trunk
---

d83564549f573e0934653129d18597892d3533de